Don't use gcc extensions for the ternary ?: operator. (#147590, Damien

2004-07-14  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaboutdialog.c (add_credits_page): Don't use
	gcc extensions for the ternary ?: operator.  (#147590,
	Damien Carbery)

diff --git a/ChangeLog b/ChangeLog
index be84564898a9d360d9bc09ea97efd56c22d39e6c..eeab96234663c93e06f3cb2adbeba38581d6dc1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (add_credits_page): Don't use
+       gcc extensions for the ternary ?: operator.  (#147590,
+       Damien Carbery)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index be84564898a9d360d9bc09ea97efd56c22d39e6c..eeab96234663c93e06f3cb2adbeba38581d6dc1e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-07-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (add_credits_page): Don't use
+       gcc extensions for the ternary ?: operator.  (#147590,
+       Damien Carbery)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index be84564898a9d360d9bc09ea97efd56c22d39e6c..eeab96234663c93e06f3cb2adbeba38581d6dc1e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-07-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (add_credits_page): Don't use
+       gcc extensions for the ternary ?: operator.  (#147590,
+       Damien Carbery)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index be84564898a9d360d9bc09ea97efd56c22d39e6c..eeab96234663c93e06f3cb2adbeba38581d6dc1e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-07-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (add_credits_page): Don't use
+       gcc extensions for the ternary ?: operator.  (#147590,
+       Damien Carbery)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index f5df56128022e873086c5373b2558e58e80900b0..2d3ddeb3b3b8f9d48ea4cf707bc7cc3b5168c96e 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -1572,7 +1572,14 @@ add_credits_page (GtkAboutDialog *about,
          q1 = linkify_email ? strchr (q0, '<') : NULL;
          q2 = q1 ? strchr (q1, '>') : NULL;
          r1 = linkify_urls ? strstr (q0, "http://") : NULL;
-         r2 = r1 ? (strpbrk (r1, " \n\t") ? : strchr (r1, '\0')) : NULL;
+          if (r1)
+            {
+              r2 = strpbrk (r1, " \n\t");
+             if (!r2)
+               r2 = strchr (r1, '\0');
+           }
+          else  
+            r2 = NULL;
 
          if (r1 && r2 && (!q1 || !q2 || (r1 < q1))) 
            {